Merge branch 'master' into 'matthiasc/for-master'
authorMatthias Clasen <mclasen@redhat.com>
Fri, 4 Jun 2021 20:24:09 +0000 (20:24 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 4 Jun 2021 20:24:09 +0000 (20:24 +0000)
# Conflicts:
#   docs/reference/gtk/migrating-3to4.md


Trivial merge